Autogenerated HTML docs for v1.6.1-35-g3827
diff --git a/git-mergetool.txt b/git-mergetool.txt index 602e7c6..4c0ffec 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt
@@ -7,7 +7,7 @@ SYNOPSIS -------- -'git mergetool' [--tool=<tool>] [<file>]... +'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]... DESCRIPTION ----------- @@ -60,6 +60,15 @@ Otherwise, 'git-mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited. +-y or --no-prompt:: + Don't prompt before each invocation of the merge resolution + program. + +--prompt:: + Prompt before each invocation of the merge resolution program. + This is the default behaviour; the option is provided to + override any configuration settings. + Author ------ Written by Theodore Y Ts'o <tytso@mit.edu>
